merge trunk
authorK. Handa <handa@gnu.org>
Tue, 31 Dec 2013 14:59:35 +0000 (23:59 +0900)
committerK. Handa <handa@gnu.org>
Tue, 31 Dec 2013 14:59:35 +0000 (23:59 +0900)

Trivial merge